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