Merge \\\\"Support self-explanatory icon for PLAY TONE command\\\\" am: de3074a5ed am: 71574c84bd am: 230c22616f
am: 09a7d2404e

Change-Id: I7eb5ae333df386f7568e8fc56bcfce8fae8c785e