[DO NOT MERGE] Enforce user separation on external storage am: cc1cecc9be am: 5360f2f4e8 am: 7beb5adcd0 am: c11f30ff5c
am: f5b7af30f2

Change-Id: I2a32c68d8dd3d6caa4a2ab15d024a03fbaf98611