Bug: 317386395 Test: fixing metrics only + local build pass Change-Id: I6bac53d3219315f9d225bfe367c7b3bdc423ca7c