Merge "Fix caller validation on secondary user." into nyc-dev