Merge "Add more sane multi-profile app attribution." into oc-dev
am: 4743423a82

Change-Id: I59630cf77da700cd5a159e11ac6f9818f1303199