Merge "Offer to "fixup" GIDs used for app data." into oc-dev
am: 359ce10912

Change-Id: I4a15ad2c025728313f6024dec9a49e6dfff1ac68