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

Change-Id: I00f393fd9824e1cf8eb7d11f3fba5880320989ca