Merge "Add braces per the coding convention"
am: 7555dae262

* commit '7555dae26276213f0c3bd07b3daf7d398ba48405':
  Add braces per the coding convention

Change-Id: I090f490100984926f16e9611e171d51d2a2c20bd