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

Change-Id: Ic200ed290c85ed5cf398ab7804c542c5fea5f7db