Merge changes from topic "logwrapper-api-update" am: aef269f11b
am: 9084a131fe

Change-Id: I511e1deb94c63a2d591a427a06ee9954bac8f07f