Merge "Allow clearing instant app meta-data" into oc-mr1-dev am: e391175330
am: a80370745b

Change-Id: I719169bc27017a8e8c4d6a858c14ca2a458acc95