Merge "Remove unnecessary uses of reinterpret_cast." am: c470dc8681 am: 849a911dee
am: 6a6e54da04

Change-Id: Ia0783f4d936d844284cf488481318e8b96133066