Merge "Remove the deleted userhanle in cache to stop crashing." into nyc-mr1-dev
am: b1f01b752a

Change-Id: I4c7c358d25ff3c8cafe5f02ad834a656ab3b5483