Merge "Use unique points for fstab" am: 1e1893812c
am: 1c6d73bfcc

Change-Id: I17f2815216ebea678c4844818ec6f3007b557fe2