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

Change-Id: Ic03051c0a9d491337d9606e082ad83ecb61bd1c7