Merge "Fix test on API 23 and earlier." into nyc-support-25.2-dev
am: 2fda9e1daf

Change-Id: I5173274c4593c81d081a8a0a7e20d3e40dea4710