Merge "Fix external cache and secondary user bugs." into oc-dev
am: c419dc56ac

Change-Id: I9ef878cecaf84e577a24aeba1735d62c9541a2b4