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

Change-Id: I3e83332cd4bd7e51a3394ee5de61afc613fe9552