Merge "Add APIs from public requests." into pi-dev