Merged 413738-method-name-cleanup [r=lifeless] [f=413738]
Fixed method names, import ordering, and other cleanups.
Merged 413738- method- name-cleanup [r=lifeless] [f=413738]
Fixed method names, import ordering, and other cleanups.