Merge changes from topic "libmetricslogger" am: de6a99d702 am: ebdf08318f

Change-Id: Idb2007358af18340805d1168bebbe908e7a6604e