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

Change-Id: I5d1019e7b25601b8ad22b8a2fd728ee64ffd081f