[DO NOT MERGE] Enforce user separation on external storage am: 5432cedb61 am: c3c4b15dee
am: 7d869bd17f

Change-Id: Ifa5b484d7da23f278e4a6f80968e73993f680e7b