Merge "DO NOT MERGE Allow cross user usage event queries" into pi-dev