Merge "DO NOT MERGE Update Test Expectations for MR1" into honeycomb-mr1