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

Change-Id: I489d84ef201fe549a74da668f8e11a2b7a070499