Enforce PACKAGE_USAGE_STATS for usage data. am: 6df866a851
am: 979f227fb9

Change-Id: Ia3aaf773b4defb4b1399544ff7475cd4142f16aa