Merge "Update camera sound API." into ics-mr1