[automerger skipped] Merge "Add a new method to set time" am: 5f01cb6d am: b07f90ad
am: 1d3f4118 -s ours
am skip reason: change_id I9300dba868ed61249d0848b0dd4b953996161bda with SHA1 e376756b is in history
Change-Id: Ib9a707e3a30a91ae83b66b932ccb9b9884c8738d