Merge "Update captioning APIs" into klp-dev