Merge changes from topic "revert-10403399-pkg-override-label-icon-DCRMJNYAKW" into rvc-dev am: b69f2bc126 am: ef8b74b230 am: 9fdbebe5de
Change-Id: I568bd3e324bb8c31148dc222426c32515977a564
This commit is contained in: