Merge "Minor style fixes" am: b57df648c5 am: 57449b6ad7
am: eababaa9c5

Change-Id: I28da4b7868627b8b435344b37d08875ec6816480