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

Change-Id: Ic1bb5c4ed1e46b1a64a8b3a41e143e4651b68909