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

* commit '93ef31f1ca85cea95457af3eb6b9dc0bdbb0f9fd':
  Also update setMinLines

Change-Id: Ib75ddd419cbbbd2eebfbd434e294b474fde3e76c