Merge "Split fstab mount into 2 phases" am: f74553f852 am: eef52c49d7
am: 4d7e6f105d

Change-Id: I48d5ed319c97fcbc62fc63ab8fa1be2b67b50045