[automerger skipped] Merge "Style fix." am: d4e90d2e09 -s ours am: 3844bc141f -s ours
am: 0236cfd992 -s ours
am skip reason: change_id I1b750751148925b4a7bd94553318907654012fc1 with SHA1 288b71c8c1 is in history

Change-Id: Id8d3faca2777e21cd0269adb828efb30bfd3e3bc