Merge "Pipe through attributeTag for one self-permission check" am: 9ed7e7f1 am: 1bf1d39f am: 6094f425 Change-Id: I53399c1d5af75a3424d10106ec49911dd30a5db0