Merge "Support to play the various tones as per the Indian standard" am: 3c5b1b7150
am: 9d0e47f953

Change-Id: I8b72ffc77d1d84a4e8be84c48dc013e83160b7ec