Merge "diag: Add support for APQ8064AA variant."