Merge "Change protection level from ephemeral to instant" into oc-mr1-dev
am: ef2e7d27ae

Change-Id: I17616757875f0d2ea6a9d6f700b1c401a459fc39