Merge changes from topic "cancel_play_tone_command"
am: 29d660725a

Change-Id: I7a684e06d4239263675d319990d4500a52658279