Merge "Update the tests." am: 4614a7ae1b
am: 8547fb9003

Change-Id: I0ad4c3cd4cf548433f4d553d8685986f27977800