Merge "Merge "Also update setMinLines" into nyc-dev am: 79c0b2bcbb am: 93ef31f1ca" into nyc-mr1-dev-plus-aosp