This is identical to I8a3c31e7385283d95b4712d457784016239a0b3b, except for the array append case. Bug: T236870 Change-Id: Iac033ba467232f6ff110d575920e968759ce0e15