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

Change-Id: If3d23e42a6a055fc99fce3c15df3d9f511ebcc71