Merge "add vold to "shutdown critical"" am: da85cb71b3 am: 228b95fa15
am: 733fe09928

Change-Id: I760a1278d3138ca7a24ab69613466c83615f067d