Merge "Refactor CasField32"
am: 4f0e0b8a41

Change-Id: I334d8397090a4ebe5214eca785a076a44735878b