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

Change-Id: I1152e865864ae1a8d77b574cc13af479c198e46f