Merge "Tiny tiny style fix"
am: 6d262af067

Change-Id: I05f2224854a7a78de80da75123695ffbac2e17fd