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

Change-Id: I321ab463b66166bebb68389dfb0e03055667ccd2