Merge "Merge "Removed duplicate call to Metric log, and using private logging method." into nyc-dev am: f2413b79c6 am: 10601fa8bd" into nyc-mr1-dev-plus-aosp