Merge "Also update setMinLines" into nyc-dev am: 79c0b2bcbb am: 8524697351
am: 6379e87d06

* commit '6379e87d06ccf741b0328bed57b67b1b52fa66cc':
  Also update setMinLines

Change-Id: Ibe15ee4c83b5e51a71e49179d4428f28e2e89725