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

* commit '16ec2e661318175cb73fe0f365dd5eb53dd6ad82':