Merge "Add audio mode APIs" into master-nova