Merge \\\\"logcat: help spelling correction\\\\" am: 20a172fca7 am: 59cce987ec am: 4c04c98a31
am: aa32e374c0

Change-Id: I2618d660f3baef4567d40a092a9f6957edad9eef