am dd7fb9af: (-s ours) am 7f12fa27: am f5b46079: Merge "init: use init\'s property expansion code for mount_all"

* commit 'dd7fb9af1f1be158b900d1b0571a8a238ed6eed5':