Merge "Correct cleanup when compacting metrics attributes" into oc-mr1-dev
am: 66bc7b728c

Change-Id: I19793e847f718b36142bf2fa93dd7805fee625bd