Merge "Code reformatting for upcoming automated code changes." am: 661facc2f1
am: aca9678a86

Change-Id: I153eca69dcddd809f11ebc398380a5dca9408041