Merge "Check device build id and flavor after flashing"