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

Change-Id: If8801cd35c71e35cbb11881dca18a58bab1b4aff