Merge "Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 0dc740b13d" into rvc-d1-dev-plus-aosp am: 74ddcbe020
Change-Id: I3233d44bb75457662fca639cbf24cc4d04c15c55
This commit is contained in: