am: 1684220
* commit '16842209da671dd34836f8ca68a5a70822ed9e34':
Several code quality improvements
Change-Id: I707bda857ca8f4d6a7b5a788f75cba2b325ce1e3
am: 1684220
* commit '16842209da671dd34836f8ca68a5a70822ed9e34':
Several code quality improvements
Change-Id: I707bda857ca8f4d6a7b5a788f75cba2b325ce1e3