Merge "Fix a typo." am: b15098ba68
am: 79ee7b78e3

Change-Id: I7a57d3924a4b00e6e0aa081cd56a265224775cd8