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

Change-Id: I490346da2ec3909650c88156c94754e9864019ee