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

* commit '8524697351bb034c56bce99b6503225ca121fc71':
  Also update setMinLines

Change-Id: I0dff24ca60c040bc003ccae9b0111a1e437ce255