Merge changes from topic 'music_extraction' into oc-dev
am: e44061f9e7

Change-Id: I8c5a58540be4e96aea4c48a8365f512d508ff1c5