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

Change-Id: I7c5f7aefd7ed0a7a1dfcb0a10b541046fb54e94b