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
* commit '46e657bd':
Enforce backup encryption in the UI, not just in effect