Merge "Change  the "since" arguments generation." am: ea77ee39f5 am: 0cb078bba2 am: 008e32bfe0
am: a8f3d0c22a

Change-Id: I8b2bb408eb3aecb17f4fd5604d0cb6dcb2369ccd