Fix Metric setting problem

Change-Id: I1a5f529a4bd418ba2046d4785ec6d2190b112e70