Merge "Minor adb style fixes."