Merge "Remove bluedroid configuration warning"