Merge "Fix CHA test failures under some configurations."
am: 59715029ae

Change-Id: I2b3f997173ad4a99470333b2d1c7c5dc4ec15b6f