Merge "Add a new method to set time" am: 5f01cb6ddc
am: b07f90adb8

Change-Id: Ia70ee27e4817cc1465513eaa7e076c8ccc4aee11