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

Change-Id: I966a8eacbe9f81d0598b3b65663da42eda702f6d