Merge "Fix generic inferred type argument."
am: 7e5cce2c67

Change-Id: I5ac5579440d309c583debe5ce876721a84460c84
tree: 8cd3a9d4b7781730bccb2547f3788a0edc734e4d
  1. core/
  2. services/
  3. tests/