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

Change-Id: I9222a40b55e8e5d6dfa150e00af02b4cdf3ea738