Interim commit of metric model.

Change-Id: I54c74d796bd175fe056353983043a10c03974185
Merge "Interim commit of metric model."