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

Change-Id: I3a8d07b94d5cf410b628c3f3f66a1b94e0cb6e1b