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

Change-Id: I272198c85fbe07c20d3fb60bca2a9709e615aeea