Merge changes from topic "logwrapper-api-update" am: aef269f11b am: 9084a131fe am: 4fb34975fb
am: 5c3dc0bd95

Change-Id: I663deabe18a2fb8094d36288228a28fe7d190069