Run automated code reformatting in Android Studio and manually fix unwanted/broken style changes Change-Id: Iaf14a08a275f9b11e1ae17f69201ab61a9c6ade1
Change-Id: Ib28e752583926e9740dd7e954d208d4fe62e3c08