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

Change-Id: Icfae0366c23b03ac66052a4d180af35dccd37db0