DO NOT MERGE Mask case of base or tree permission being null am: cb8a640cef am: 28fc6a28aa am: 43b98a8f9d  -s ours
am: 28cf47799b

Change-Id: Idb152f0b337f552deec9a763c4634dad5bf186b9