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

Change-Id: I118a28b210927073703edb04dabf6c5bba935e27