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

Change-Id: I74577f64016612e2cf02b164528a12619bc30bee