Merge "Add NonNull and Nullable annotations to MtpDevice."