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

Change-Id: Ie004c676f9021ff69a0c0bf06b200b0f479ba958