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

Change-Id: I8db0c047d6a300468b9ff05519a4ea431994d02a