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

Change-Id: I178ae33e7612f854dc338b23745dbb9b231eb957