Merge "Harden /mnt/pass_through permission bits" am: eba798a767 am: 6bb2476ebd

Change-Id: Id6c6110d7d985a60e3c386be73647cf99b692b77