[DO NOT MERGE] Enforce user separation on external storage am: 5432cedb61 am: c3c4b15dee am: 7d869bd17f am: 0312164f4b  -s ours am: 45beb672fd
am: aab2da8ce2

Change-Id: I722971c0a06982395641a169b9c959b639b17539