Merge "Adding GSI fstab entries when needed"
am: 2baecf3c8f

Change-Id: I71824eec82427cf5c4a290e0b919952c7e4e6e76