Merge "Make @deprecated without a comment an error DO NOT MERGE" into gingerbread