Merge "Update Expectations File" into gingerbread