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