Merge "Create Instant App cookie dir if it doesn't exist" into oc-dev am: d2cc513e9f
am: 75a64a450e

Change-Id: Ie4d9d3f3f84920a75afd4cd1bd07737f3ad95aa8