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

Change-Id: I884b45fbdf1d821db563174bbb9abb894b98f912