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