Merge "Fixed a typo" am: 42187acc7b
am: b54f70ba5e

Change-Id: I3f94588ac1cb98e729705dea6abdc24d1113b47d