Merge \\\"Move legacy full disk encryption code to Settings.\\\" into nyc-dev...
Merge \\\"Move legacy full disk encryption code to Settings.\\\" into nyc-dev am: f8c64089 am: 6233c1d0
am: 0257b604
Change-Id: Ib83026588c45c80f06951639865d0a04421f990c