Protect against crash on user switch am: 6e6af2c7ee
am: b7218524bc

Change-Id: I53e6997e903c109e2584e8be5674d17515c86e0c