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

Change-Id: I666cd47c924f5d6f767517bc3c9631907fb44f5e