Merge "Minor cleanup in EncryptionInterstitial" into lmp-mr1-dev