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

Change-Id: Ic98ee802f582863f4953c908d5455879da4af097