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

Change-Id: If974a4c8695ff7d502a3cf11f33ea9197fb63db1