Merge "Reducing the image sizes further for low-ram devices" into oc-mr1-dev