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

Change-Id: I35fea7acf6bd4084b06cb17c580c75df08ef484c