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

Change-Id: I75625816eba3a60c46bf27c6f7c6df7606e9faee