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

Change-Id: Iac38e1b96eb46faea98958bec6d40ee823a18e77