Remove unnecessary reinterpret_cast

Change-Id: Id2ddf4e74bc66825206d1287f899d716537a68d0
Merge "Remove unnecessary reinterpret_cast"