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

Change-Id: Ib2977bdd6087ccaaeda3412c02c5f992e679cde9