Split fstab mount into 2 phases
am: d61a7e2da4

Change-Id: Ia245c0beda661e0876fe481f90abad17a0e81ce1