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

Change-Id: Ie09f638512f3e11912fef429cd44b22518f624bf