Merge "Allow redeclaring typeattributes" am: f8bc6cee3f am: ceb5dea905 am: b7559e571b
am: e04a7757ac

Change-Id: I559b7d67801a5da8565d7119ca4b2d8f050f86f5