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

Change-Id: Icaf906a27a1c88703dfda3431a573d3d010370fc