Merge "Allowing product-specific fstab.postinstall" am: 66920d2072 am: 43145ee304
am: ef290c560a

Change-Id: I9c76ecd83ee7abf2728655398bf3bed36f346363