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

Change-Id: Ia2c95906c0c526f426deaa243ff075ce70bee1fc