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