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

Change-Id: Ia33a6a01c57dab973260ea0b330c5652619c5533