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