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

Change-Id: I59283077344f07c325f49da191c291f69b8ac1ae