Merge \\\\"logcat: format verbs and adverbs\\\\" am: 82fb012a03 am: b13d0ce160 am: b6dbe28746
am: 6a70a53235

Change-Id: I5717a2a299e29ee41ca65306694340003bb4806e