Merge "Add null check for osAppId" into stage-aosp-udc-ts-dev