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

Change-Id: I112f553f4e456cc4f133109f41940904bdd62c7d