Merge "Upstream getApplicationLabel()." into oc-dr1-dev
am: 7049137d7f

Change-Id: I48e3995679750566d551edc3f63fa98a55bbc75d