Merge "Do not show exception stack trace when no child profile key" into nyc-dev