Merge "Use headers from adb."