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

Change-Id: I5e760fcb4f5da57dae57a0c80fac4f0915529691