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

Change-Id: Ie8eabe8fac50f4ab082e6d655d290ebd3b17a0fc