Merge "fstab files: update to mount cache with noatime option" am: 577cbd98dc am: 27d890dd23 am: fec553b53c
am: e780c76f79

Change-Id: I480adb77785e8aa4022d8dd75845c16c0d701a0b