Merge "Update test as per the updated ClipDescription.getTimeStamp api." into oc-dev