Merge "Update the tests."
am: 4614a7ae1b

Change-Id: Ieeb5e4ccc512ddf120e29c55f6d7fdb01aa4c11c