Merge "Remove data usage v1 code."