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

Change-Id: Icf7b613baa241f2ff573ba1b8d51f77a33687433