Merge "Set default size for 32-bit GSI to 1 GB" into oc-mr1-dev