Merge "Marking ClipData as LOCAL and adding comment in jobscheduler proto." into pi-dev