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

Change-Id: I9b12f5852d245ffe23f150e0c19a3667cf5fd9b3