Merge "Define a meta-data attribute for a carrier icon." into oc-dr1-dev