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

Change-Id: I1e7d36e908fb9879b4cc277c1b3d6cf0bed64024