Merge changes from topic "audio-package-update" am: 2d5156733c am: cad356a9d0
am: 94976cab99

Change-Id: I91a7ebe00ea9e342ebe62e238736d3e3a253119e