Merge "DO NOT MERGE Bring Metrics summarizers over from master" into oc-dev am: afc598dbbc
am: 4b8688ac33  -s ours

Change-Id: I18da42835db803974943b9930c275c28bf3e4e43