Merge "onTrustChanged callback triggered before onTrustGrantedForCurrentUser" into udc-dev