Merge changes from topic "revert-10403399-pkg-override-label-icon-DCRMJNYAKW" into rvc-dev am: b69f2bc126

Change-Id: Id381112666f7ca9c4c0bcd21244a6398fe943129