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

Change-Id: I7c0d9a68786a178e6cf3206c179760f05d1eff82