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

Change-Id: Ia00ed78e8b22875ad2aba2877f6a6b78f7683e81