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

Change-Id: I9a7074a7793cb8f9c1cc4363e2a567b1a0d09586