Merge "Update diff files which break benchmark suite" am: 8e6687fd5e am: 4d0421beb2
am: 15861f6aa9

Change-Id: Ic0696d6c3db0f65c8df865055d125e20dda45ffd