am eaa44910: (-s ours) Merge "Layoutlib fixes for L [DO NOT MERGE]" into lmp-preview-dev

* commit 'eaa44910ade5493ca15ee10af037c1e92c1143f4':
  Layoutlib fixes for L [DO NOT MERGE]