Merge "Specify correct size for 16 bit wave table am: 3583b98a2d am: 6f44d3fc94" into qt-r1-dev-plus-aosp