Merge "Rework getMetrics() api per API council" into oc-dev
am: 1a897a6231

Change-Id: I4a1294401f0af573cf6a3bb90c75bf401545cc31