Merge "init: add TODO for mount operations." am: 94e9305511 am: e053c09f8d
am: 6b07191d13

Change-Id: I80877e5738afc0deb3f2c48dc462498ea310d578