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

Change-Id: I17ee5e1fe0893824baf7c3b166a498c26bb8def3