am 850992c4: am a5690945: am f55159c1: Merge "Fix style issue."

* commit '850992c40069511e8c4828a55c35e9a25d4aa851':