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

Change-Id: I598a6256a480b8c0cb84ddac7452145636cc5f44