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

Change-Id: I8475be8a4495969aa66826791c9966d7b407f78c