Merge "Merge "Change the "since" arguments generation." am: ea77ee39 am: 0cb078bb am: 008e32bf am: a8f3d0c2"