Merge "Remove permitted path for non-isolated namespace" am: ce17f19bc8 am: 8f6b3ed826
am: d7add90cd3

Change-Id: I08debb40a730cf511b1e02c21db46bd7dd29e305