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

Change-Id: I13c215dc504a3745402327aaead9d7f6d36bc695