Merge "Allow redeclaring typeattributes"
am: dcee57b8c2

Change-Id: I99ec6c055c8f6f04be90a4710ae278ba676f741d