am 46e657bd: am 26faa0be: Merge "Enforce backup encryption in the UI, not just...
am 46e657bd: am 26faa0be: Merge "Enforce backup encryption in the UI, not just in effect" into lmp-mr1-dev
automerge: 134aedd2
* commit '134aedd2':
Enforce backup encryption in the UI, not just in effect