bug: 3201828 - Brushed up the code Change-Id: I11ad9d1d749bd8947144ca7f1676bab3cf777fd6
4deb52f3
20777fae
584bce31