Merge "Adjust comment on data over usage string." into pi-dev