Merge "[automerger skipped] Merge "Schematize vold system properties" am: 095d0f64 am: 73694f8f am: 1a7cad6b -s ours"