Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev
am: 684b5381e9

Change-Id: I3be91519cbe8b7c3cef474923a30927504e68642