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

Change-Id: Ie2eff394b40dd42d7c635dd8869ee96d35bd5486