This is from the type mismapping bug fix in metadata generation. Change-Id: Icaa9916e00e76b30cdc5688c3d3b7e9cadf84794
d023360a
484c88c3
4ccc4bd5