Merge "Protect against crash on user switch" into nyc-mr1-dev am: 1ec6ccdafc
am: 9192902fb4
Change-Id: Ic3ef1a011243dc3af5ff9b9f5f8e87c8713e5203
This commit is contained in:
1ec6ccdafc
am: 9192902fb4
Change-Id: Ic3ef1a011243dc3af5ff9b9f5f8e87c8713e5203