[automerger skipped] Fix crash in mainline
am: 1b535e41fd -s ours
am skip reason: change_id I135099625f77344d1f8d2e8688735871c44ef2f5 with SHA1 9a6d1f73e5 is in history

Change-Id: Ibfc9efb88aaac867a710529631a30fe33ba570d3