Merge "Move the attribute tags" am: dcef50e27d am: b0679fed6c
am: 8dcfc05b97

Change-Id: I94b4c89ee60014a3a9bc184009a5c479c1ee0743