Merge "Always report a uid's initial cached state." into oc-mr1-dev