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

* commit '036f8ac188249586b265c08f31f8d22bb6449e3f':

Change-Id: I2b63c7228247ee76b7832005771fc4bc853f08e1