[automerger skipped] Restrict Automerge: Fix reinterpret_cast security bug am: c38310ff54 -s ours am: ced29d99a7
am: c14f23093e

Change-Id: Iec6e7552b3dd1dda332ac60724f1879930311206