Merge "Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295
am: 22ac6baf3d
am: 06554d19ae" into rvc-qpr-dev-plus-aosp am: e33d4e6512
Change-Id: I696182967389c2deccf749607a879b36c38b0875
This commit is contained in: