Merge changes from topic "logwrapper-api-update" am: 0888874bb4 am: 39cfd193bd
am: fe9c676821

Change-Id: I4d07ae922ada4a8355372f9aa3ecf3b1f7dd1b79