Merge "Layout tests API 15 compatibility" into nyc-support-24.1-dev
am: 9629daa7e2

Change-Id: I33df7fa780d61fc21f9bf713c16e32b2db9c3a6d