Merge changes from topic "libmetricslogger" am: de6a99d702

Change-Id: Id4354ba024b98631a3d3ee4bc638d9c17586a872