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

Change-Id: I7df830c90c67f93efeb3c28f094b682ea9ac00fc