Merge "Fix LOG() messages to drop \n" am: 3fca67514a
am: d5c078986e

Change-Id: Ibbd0bc18f8b4d944d94dfd3c25e4a267028a33a5