Merge "New constant for BUS audio devices" into nyc-dev