Merge "Fix style" into lmp-mr1-dev-plus-aosp
automerge: 5e999ac  -s ours

* commit '5e999acf530be02239349e134f75b43122fc3c4c':
  Fix style