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

Change-Id: I9a9f9e89baccafc2cd22ff82b4ff5506b1869673