Merge "Handle type annotations when generating cache keys" am: 255b001fc2
am: 221404f748

Change-Id: I6cda5bf0fe35ca432d78187dcb8e4d66bfa69bb6