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

Change-Id: I2b6d0772a5e3db4b539db0c4facca583cabe92c1