Merge "Merge "add vold to "shutdown critical"" am: da85cb71b3
am: 228b95fa15
am: 733fe09928
am: 9045c86a32"
commit
9344a3426e
da85cb71b3
am: 228b95fa15
am: 733fe09928
am: 9045c86a32"