Merge "Remove unnecessary reinterpret_cast"
am: 71a681b891

Change-Id: I0a7cbc220c82dae4a7ff6fc20a38c7632b459df4