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

Change-Id: I73941a7f22d70380a7239c78e1f6628e0d456470