Merge "RESTRICT AUTOMERGE: Larger image for testConserveMemoryPlusHardware" into pie-cts-dev