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

Change-Id: Ie786828d0e940acb1feeb64618ddc78757519fb4
tree: 92ad1489a81b3e3ae1eca0e4cf10150a5b6be091
  1. core/
  2. services/
  3. tests/