Merge "Fix issue #22414729: Checkin start clock time is different from hsitory reset time" into mnc-dev