Merge "Move the attribute tags"
am: dcef50e27d

Change-Id: Ie01976685722f8cecf847544d2c04a4ece49f3f6