DO NOT MERGE Mask case of base or tree permission being null am: cb8a640c...
DO NOT MERGE Mask case of base or tree permission being null am: cb8a640c am: 28fc6a28 am: 43b98a8f -s ours
am: 28cf4779
Change-Id: Idb152f0b337f552deec9a763c4634dad5bf186b9