Merge "Remove unnecessary reinterpret_cast" am: 71a681b891
am: b01eb15e91

Change-Id: Id3cd5da8790f07af8a1e2d440ba4e31828aa0fb0