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

Change-Id: I30aebb1be47273d1f5633d8a8296c08a3c1e750c