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

Change-Id: Id65857445e06db89c97fb450f37c99a0c3a40ed8