Fix EMR API to reflect reporting api changes in latest snapshot