Merge "Code dump with latest updates." into udc-mainline-prod