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

Change-Id: I4612ede83cdfca783e902888201a80fc97b8c9c2