Merge "Fix the typo missed from comment" am: 3c002c543c
am: 42577fc242

Change-Id: I41a661539b7d4419b40f9c84c98eba1547d2cea9