Merge changes from topic "revert-10403399-pkg-override-label-icon-DCRMJNYAKW" into rvc-dev am: b69f2bc1 am: 745b3848 Change-Id: Ifb2636a3d4cfdd4b2e1da8ef9ac8f66bb192193f