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

Change-Id: Ib311a1d8cb98606fc4e952ace57d2991e3842175