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

Change-Id: If257a4736d2534e9bde42b264fccdcf3903c0439