Merge "Fix syntax issues in HashMap.annotated.java."
am: 05f17995de

Change-Id: I43f540baa2930a520dfd1d80e5a9eae995748f8a