Merge "Add a flag to log service side runtime exception" into nyc-dev