Merge "Pipe through attributeTag for one self-permission check" am: 9ed7e7f1b1 am: 1bf1d39fa4 am: 6094f4258e am: 7fd121e139 am: b54512bca9 am: f35af1fc36

Change-Id: I4635e1323c171f876ad75581d00b3bc62b8b528c