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

Change-Id: I5fad00f97ef0aaec125cf0d3417e48fafe45243c