Merge "Split fstab mount into 2 phases"
am: f74553f852

Change-Id: I17d0fc5e93fb080408e3ea4738c53a347e9f65d9