Merge commit '2edbd217af15ce3e1e3632da1e679db5153111b8' * commit '2edbd217af15ce3e1e3632da1e679db5153111b8': Fix bug 2115258 where the AudioManager javadoc doesn't warn against
Merge commit '2edbd217af15ce3e1e3632da1e679db5153111b8' * commit '2edbd217af15ce3e1e3632da1e679db5153111b8': Fix bug 2115258 where the AudioManager javadoc doesn't warn against