Merge "Fix typo that leads to crash."
am: 84190220df

Change-Id: I9725b965cf0c5ef733deb514eec8117685a62640