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

Change-Id: Ic79d3e61e2167da5bcfcfaa08086ff9e6bcf5747