Merge "Update ClipDescription.getTimeStamp to use currentTimeMillis timebase." into oc-dev