Merge "Passed an extra flag denoting whether assetId is present or not" into udc-qpr-dev