Merge "[nearby] Log changes" into udc-mainline-prod