Merge "target: apq8084: Update the UART id."