Merge "Add support for carrier "associated" apps." into nyc-mr1-dev