Merge "Support mounting same mount points with different fstab config" am: 82b8e518e3
am: f4ccc0ed5b

Change-Id: Id74d0e94cd402262c6e05c15386970a8c7aea63a