am 675f13bf: am 2f2e3797: Merge "Make LeadingMarginSpan2 behavior more consistent" into lmp-dev

* commit '675f13bfa8abcc439af1218e9de4d834e9253ede':
  Make LeadingMarginSpan2 behavior more consistent