M20180221-0535
generics Change-Id: Ifed39611382762a70b71c15890ae502ec9735a5a (cherry picked from commit 48a3a3eb7ea3d5a31b91fda5c892849f5bc403c6)
generics Change-Id: Ifed39611382762a70b71c15890ae502ec9735a5a (cherry picked from commit 48a3a3eb7ea3d5a31b91fda5c892849f5bc403c6)