Merge "Reduce the system partition size of generic system images" into oc-mr1-dev