Merge "Resolve a metrics conflict." into arc-apps