Merge "Add test to make sure a null dataset id on auth response doesn't crash system" into pi-dev