Merge "Add null check in usagestats dump"