am 0449984d: am a5690945: am f55159c1: Merge "Fix style issue."

* commit '0449984de69f397621d4b178dba553958dc76500':