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

Change-Id: I3e0a8aeac4ab70fa5e35561319f7b41ec08b6450