Merge "Code reformatting for upcoming automated code changes." am: fc38791616 am: b4a4f7e366
am: 8ee7922c16

Change-Id: Ie6ecb183acd0bd0271bc0e940b4b7fb66098f4af