Merge "One more test to disable for CHA." am: 46bfb7c047
am: 94a7fca769

Change-Id: Icf45749b45300b6f3841dccf6319c250c130339a