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

Change-Id: I59e636be20a5785a8398f1448bec04f134514c36