am 46e61156: am 173e931d: am 5bbc0265: am 5bc625d8: am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev

* commit '46e61156a080152c504f2b9c674e990f19dee8e2':