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

Change-Id: I7efe63f567a497e313e267b29de5f33aeaf34b11