Merge "save uncrypt status to last_install" am: cdf509cce2 am: 6048138e10 am: 86ea1724ae  -s ours
am: 5a6e719176

Change-Id: Ic26c0844a97f25a809c3b413338caff3fa03d641