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

Change-Id: I28d2e598a9599ded68f9682a058133fcb12eec9e