Merge "AudioService: fix step rescaling."
am: 7516db2ec2

Change-Id: I12c88bb68269fb018c239ad267239fefbb06368d