Merge changes from topic "revert-10403399-pkg-override-label-icon-DCRMJNYAKW" into rvc-dev am: b69f2bc126 am: 745b38486b am: 554049cb05 am: 3eb7d19e3d
Change-Id: I0e5a463f44fbb51dc724c13d2c7c43d0f2df0b2e
This commit is contained in: