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

Change-Id: Idf6c6bcf529e4b7a2973fe9d1ee43aa155282dbd