Merge "init: mount_handler: system-as-root (legacy)" am: a896e2aee5
am: 7bf190aa32

Change-Id: Idbd93068f8ab339a56bc790336e6130161e7eaa5