Merge "Fix generic inferred type argument."
am: a538107ad1

Change-Id: I5ac5579440d309c583debe5ce876721a84460c84