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

Change-Id: I5a981e0483a723be7d8fdc22d9b052a97dbb422d