Merge "VolumeZen: frameworks changes to support Settings."