[automerger skipped] Merge "Code cleanup to conform to style guide / linter." am: f5ff8f0661 am: 420eec4f52
am: a1f14e0912 -s ours
am skip reason: change_id I9274b32f1f606f29f6eb3a1e5068ca18f607afe7 with SHA1 efce929711 is in history

Change-Id: Iaf643792deeb6d0e7369daf1f85bc882a8028b99