[automerger skipped] Fix crash on eng builds
am: db96eea701 -s ours
am skip reason: change_id I4dd0d51f7c9b86772912d05b2cb04203f50cf2b2 with SHA1 0f1b9535ee is in history

Change-Id: I712a28024a7d410bc2a55cae0c794b11aad1afef