Merge \"Don\'t layout too many items for the test\" into nyc-support-24.1-dev
am: 333ffc44b8

Change-Id: Ia57cc19561e2019dc00c97dc16c1019769482972