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

Change-Id: I2a03a4cd9e4f6e7f3f394e5fb828dc6cb12a7dff