am 8c571342: Merge "Supports extra layout space" into lmp-mr1-ub-dev

* commit '8c5713428379689839330c344c4a800039db0400':
  Supports extra layout space