Merge "Harden /mnt/pass_through paths" am: 294c16024b

Change-Id: I4f7c433bdff45c44aadd4789263b22c00a470ed7