Merge "Pipe through attributeTag for one self-permission check" am: 9ed7e7f1b1

Change-Id: I7c05f861f67627da6045a01f2e8f72eda3effb3c