[automerger skipped] Merge changes from topic "libmetricslogger" am: de6a99d702 am: ebdf08318f am: 81f0a19a5f -s ours
am skip reason: Change-Id Ie990f7f1651b7717f21553481dc8635a01993777 with SHA-1 317b738176 is in history

Change-Id: I4d8013a1ceaa71e76ec6c3cbb5b850f2d1d8333c