Merge "Use buttons for EncryptionInterstitial" into oc-dev
am: b6a0360a92

Change-Id: I07ac891f736ba3707b01b629732df4a963ab64cc