Merge "Upstream getApplicationLabel()." into oc-dr1-dev