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

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