Merge "Synchronize increment of resource cache generations" into udc-dev