Merge "Use EXTRA_ENTRYPOINT to log entry point for metrics" into udc-qpr-dev