bug: 3201828 - Brushed up the code Change-Id: I11ad9d1d749bd8947144ca7f1676bab3cf777fd6
096c4c44
251384a7
6bdd6937
5df8c155