Merge "Add chirp APIs" into sc-dev