Merge "Add MediaMetrics TestApi entries for hidden fields"