Merge "Merge "Switch from shortlabel to label" into rvc-dev am: 6d631202 am:...
Merge "Merge "Switch from shortlabel to label" into rvc-dev am: 6d631202 am: 0dc740b1" into rvc-d1-dev-plus-aosp am: 74ddcbe0
Change-Id: I3233d44bb75457662fca639cbf24cc4d04c15c55