[automerger skipped] Merge "Style fix."
am: d4e90d2e09 -s ours
am skip reason: change_id I1b750751148925b4a7bd94553318907654012fc1 with SHA1 1f1c25e815 is in history

Change-Id: I59e092218b462a2505a5522de8713a7fc584070d