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