Merge "Update context sync adb commands" into udc-dev