Merge "Fix maxLines/lines properties for BoringLayout" into oc-mr1-dev
am: ae90cfccee

Change-Id: I6c0070008432277fbb6ee6ce010c4933e2a7d735