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

Change-Id: Ibc1f1d416b8dda2c4afcbff457849abde42dac48