am 6603f144: (-s ours) Merge "DO NOT MERGE Update Test Expectations for MR1" into honeycomb-mr1

* commit '6603f144bfdacc53cd2c7a71a1d8e52939db0264':
  DO NOT MERGE Update Test Expectations for MR1