Merge "Remove flag for data usage v2."