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

Change-Id: I43c3698371f788fdb3942f91eec23bae125c3dbe