Merge "Use global default_fstab instead of re-reading" am: 64f5e5bb38
am: fd5d1b173c

Change-Id: I7ec6ba24f23b3ab62317802422eb2b01e616bce1