Merge "Suppress tests that were affected by recent UI changes." into oc-dev am: 594248f025
am: 3a66172735

Change-Id: I208d5b562ad1aa8f799a23512b9fe2669896be9e